Merge branch 'master' into treeview-refactor
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Thu, 25 Nov 2010 06:07:47 +0000 (15:07 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Thu, 25 Nov 2010 06:07:47 +0000 (15:07 +0900)
1  2 
gtk/Makefile.am
gtk/gtk.h

diff --cc gtk/Makefile.am
Simple merge
diff --cc gtk/gtk.h
Simple merge